# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1496.1.20 -> 1.1496.1.21
#	   arch/ia64/Kconfig	1.38.1.11 -> 1.38.1.12
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/12/19	bjorn.helgaas@hp.com	1.1496.1.21
# [PATCH] ia64: Force generic and hp kernels to use 16MB granules
# 
# This forces the granule size to 16MB for HP zx1 and generic
# kernels.  HP sx1000 machines require this.
# --------------------------------------------
#
diff -Nru a/arch/ia64/Kconfig b/arch/ia64/Kconfig
--- a/arch/ia64/Kconfig	Sat Dec 20 00:39:07 2003
+++ b/arch/ia64/Kconfig	Sat Dec 20 00:39:07 2003
@@ -584,6 +584,7 @@
 
 config IA64_GRANULE_64MB
 	bool "64MB"
+	depends on !(IA64_GENERIC || IA64_HP_ZX1)
 
 endchoice